Merge 6a0f2403124843c0f328b93c3a7c343a4f37603d on remote branch

Change-Id: Iac3e8507f6dbeae75268c00c539147cc5f0eb434