Merge 335a32dcc3227bd5aa7a92a35e0a8a12be9d3a59 on remote branch

Change-Id: I7d611b413166cf68650d5b7f773d26b2e0803039