Merge d478e6b35e6bfe6acf3edd08d447d10aedc3015d on remote branch

Change-Id: I54669fb0959fe423072ec07e0907b095212ebf9b