Merge 5b745d82e391dbdb1c7e55c2b408fc3073c72779 on remote branch

Change-Id: Ib3ac553b086ea759bb12e97de941dc1fc858ccf9