Merge fc7a49147a529de7f99a7a3b38d46da84db197c6 on remote branch

Change-Id: I3f97d789bd3ebe7a63c6f1e400969dbb86b49409