Merge changes from topic "remove_ce_caching" am: 02e09b98b0

Change-Id: I064eaec6c1c5c056c850b71534b1e768a69a8d3a