Merge 5445978d675d596d6767503da5934125bb3c18ea on remote branch

Change-Id: I051dac110f2f47d8f31097cc824b8d14bcb97a0a