Merge "Add GetPrintableBuildID()." am: 49047d711b am: 8bd4aa963a
am: 7d605a8cb7

Change-Id: I4cccefe80db54e9f6699cd42718e3038d3eb3667