Merge 3cdaa83107b0cc205c0948b12cddf0362ef2f14a on remote branch

Change-Id: I9f78aa7ff51bd17d54aa49dfbf57d9bb8ccc797e