Merge 710ad945d4ab40fc9e0cd9d4cdc86c75e4fab867 on remote branch

Change-Id: I00de23aa3b7696b480ef8cd418eeccb44fbfc6ba