Merge b8fd4585c2dc80d6b06993af0041364456e6da1c on remote branch

Change-Id: Ib7f160a4532726045b936185f77ed5aff80b75bf