Merge changes from topics "bug136256059_attempt2", "bug136256059_builder" am: 6ed8fce3 am: ffd40f7b am: 4b461c15 Change-Id: Ie3442bd7a8b27b9d446137079bbacb125dff753d