Merge 46b38cc7c6c1c4496359c4472edef59be47e0ff7 on remote branch

Change-Id: Id10e59a70baaffb8c1f16bc1dfab2e0324843e21