Merge 17fc499a783acccd7c28e63b4c0329bd22b7e6aa on remote branch

Change-Id: I368c4bea356ad3aa01ae82d879bb701d457a024d