Merge 45e623c5c6491e6f1ac322f5901a05a3120a8ec2 on remote branch

Change-Id: I14964c7dad146cf2cd1b1fdb6b5aa3870069205f