Merge c16b44c509e4623b3852fe3218b6cffe84239421 on remote branch

Change-Id: I273ce22880eea25da8a75e31843df0e7b8d0fce4