Merge e378e6362a7d8c36e72541a09f03fc991750c610 on remote branch

Change-Id: I3e496e3d0e2b7b0d2ca719d1276ff27ec2885cf2