Merge c4314489ff24f630aed502ca3943027c54cbe200 on remote branch

Change-Id: I5a2e691a3a4292d35dc9025eebac69c840dfa9bf