Merge df5323a2d342f7c3d976961c4644f7cbda3241e2 on remote branch

Change-Id: I241afa8c9aab252e2e35e2eaea61fb260a6ba047