Merge 6bffceddfc20920d97914808011ad7c544fbe2c2 on remote branch

Change-Id: Ia6d262c14f9734c13273448dd9f23da11d2cb161