Merge 0fb7abe717fab15465cc508e1952991147d96316 on remote branch

Change-Id: I70109efc7272c36e3395d7639437218777c62027