Merge 08072fde1d32f51bae83743c4020b9b68dbe4954 on remote branch

Change-Id: I1e802bb0422949c405d97bcd935b811df890892e