Merge 17fc499a783acccd7c28e63b4c0329bd22b7e6aa on remote branch

Change-Id: I3d617ea1e661b210889857f6670deb816500e8d8