Merge 061f08911086a2fc54e85608f30e6812854ce71f on remote branch

Change-Id: Idcb30f4aacb58034df8f03b5fe501589ca8d2124