Merge bd23b7bf20ed96d2640cd7547fa17915c46a8834 on remote branch

Change-Id: Ia02e2eae5774948b5cd66af4bd294c932a002363