Merge 1f7904384363ffb8416bdadb6a00436e363a3b7b on remote branch

Change-Id: Iff23c3f7d1f07a8660e9a24d7c5a8ab69639c198