Merge "Align the version number text view." into oc-dr1-dev
am: aead86058d

Change-Id: Ibe17bfc8b0e24d1094f8c43ffe98a3319abee074