Merge changes from topic "remove_ce_caching" am: 02e09b98b0 am: e29d03dbad

Change-Id: Ie12521464d6180f53a7e5bc406fc250300e0730c