Merge 3bc30e78949b81c3de2f1de74044bd7a3ea50b22 on remote branch

Change-Id: I40b164abf6cda34f0755bae462ee3677bf30a42e