Merge 630a3b7922fc5d38aa2e95cdbb2ce670ee6cb346 on remote branch

Change-Id: Ie0c276e73e42d2822323437b613687a0f0a94ee2