Merge changes from topics "bug136256059_attempt2", "bug136256059_builder" am: 6ed8fce33f
am: ffd40f7bd4

Change-Id: I66ced024c5cda2ef37e62433c8e65b9d49ca9d3f