Merge 95107a9373462b418202dca8dc50542c304970f4 on remote branch

Change-Id: Ica3217de4dc3cb0bfa5bf6eabe66758c3cb601bf