Merge cbfbd05c88c79a04d23cd4a11927c8a242421aa6 on remote branch

Change-Id: I6e1152d9b561460394776b7e439e333f64abb286