Merge 459c8ff3889b7e7cd3d4c229fa1c617f91720e32 on remote branch

Change-Id: I5195a1d08e487561690f0d3493992556faa35332