Merge 91baee4be8a9c2a1365fead7fcee365b35669a65 on remote branch

Change-Id: Iffe237d027dc8018b2517acea97f412ad14130f9