Merge db133095539979a2ee6763c70fca566ccddd18c2 on remote branch

Change-Id: Ie00260e0f406b954cf480e8339b4c5e259eb0481