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

Change-Id: I6a0e985e0ed8c61bdb807547a062da581d4d8c38