Merge df7782dd473c8fa183ae2b2e7936e4490ea79af4 on remote branch

Change-Id: I3ce411a1071ec93032907b1086728980a9653b31