Merge 0fb7abe717fab15465cc508e1952991147d96316 on remote branch

Change-Id: I793a5d2d6e2ca90d6da7c622b1830015a24b40c0