Merge db24ac4621775848c9a66c74897b61f51f9527b8 on remote branch

Change-Id: Ifc7bdd9524c4794367491adc17a4edb87adbec7a