Merge 84f19b689f495298aef42fda64b567fd5923daee on remote branch

Change-Id: I15d4a23bcd5f9715647695d552f47f68fcd7e4dc