Merge cae17bbc52f505b5d09b4dd36ce3e74b21e245a8 on remote branch

Change-Id: Ib943c78fcd3b856249525b12887f0488e0520974