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

Change-Id: I612bd0c7da26f7fe5a04dbec320888d83eb1b6e4