Merge changes from topic "bug136256059_revert" am: aff95e5e am: 2d7cc3ac am: 2cf0f7a6 am: 0e77247f am: 901f252e Change-Id: I89ff2c864f64f8f6498adcacba7eaed8026afcee