Merge c582ed5e1c9344b7ee9fd4dd3906479a99e9aa2c on remote branch

Change-Id: I9bc1e44531a91f55adf54960b872e51bc92ec7eb