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

Change-Id: Iac1eefa53aba2fb4a9553b1b0de6510befc603fd