Merge 6199ae599a5b4af3203937854f1fb74d87675383 on remote branch

Change-Id: I761d8f9ecd61105b7919e732561b0cb8f2dee8cf