Merge 3849dfd237727754eb588179a9b1dccd1b4f3a18 on remote branch

Change-Id: Icec52f8515921ba949145b114571f77408e38f77