Merge 1e850f119260b21ef05c6a77343151de9ea495d6 on remote branch

Change-Id: I10642d2fe7896d1e5d6a15e882d7445d409698c3