Merge 6facc43568f6de2ca4142bb497077639c83db7cd on remote branch

Change-Id: I5a6aeb3d39dc5ff7459d3bfe7d4f147866d1119f