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

Change-Id: Iff8a4d3a293f0aa7414b69d57e9f6e216f9ff44f