Merge 39b73943e9eadadcb898efb96ab373215229e506 on remote branch

Change-Id: I613515ea2de765462a9089d5ba5df7c285a7fa3c