Merge af5d1bff666608959632933fe44286a73d2527da on remote branch

Change-Id: Iff440b72e27df0580e493736e1a919ab57ef59e2