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

Change-Id: Ib2f595355bf3e939e1780ebbd749af360c908641