Merge changes from topic "cpcpcp"
am: b25174e9d0

Change-Id: I80bd69d2c1fd96343207749fb647c66f054b8646