Merge fad6c18ccb674b3fd2e9c20b7554ea2b983bd0f2 on remote branch

Change-Id: Ifd7b50b34edf399e3bf99804f2de0786c3eea016