Merge "Fix image width alignment. Enable ImageSizeSetting test."
authorJerome Jiang <jianj@google.com>
Wed, 4 Oct 2017 14:48:03 +0000 (14:48 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 4 Oct 2017 14:48:03 +0000 (14:48 +0000)

Trivial merge