Merge ba1da7dfe0444db4ab529dd3df5e3ee16cf53090 on remote branch

Change-Id: I294bcde6e76abc71ea5e936a6513dc1d515f6942