Merge "Add caching of build id in MapInfo object." am: b26b07d845 am: 2cb6c40c2b
am: 5d102eefec

Change-Id: Ib1e5771acc3a9d3eaa6a345b4cd8aaecb55da50e