Merge 74c9955cac5c845687a5ca5a9fe5da4b5ffee556 on remote branch

Change-Id: Ib179329a3c21c077589639cd508fcfc45f5fc4aa