Merge commit 'cefe36ae9ffcb5a9d7a2be46af874c836a9db903' into HEAD am: 8b2a732f06 am: 12fbd079f0
am: a40ff3aa78

Change-Id: I122dd02a7c2bd7da9d5ccd3db4c13bd5b47f5cfd