Merge changes from topic "bug136256059_revert" am: aff95e5e7c am: 2d7cc3acf3
am: 2cf0f7a6c3

Change-Id: I4d7290175f5f5b41909c5428b66439402f22d12b