Merge "Add caching of build id in MapInfo object."
am: b26b07d845

Change-Id: I8773da5fa8b0be2b450465c5c1602eb6d497d46d