Merge edf601aec3da7a6a0ec786f387adf83a02e6a6da on remote branch

Change-Id: I7c43fa5c81a8da7a47fcc7d360da3716e19fa406