Merge 47c34c8ea639c7e2ccf6b3b361473d5c534923e4 on remote branch

Change-Id: Idf119a6f634b8716ad9dd2585a71d74e21ffc9f1