Merge 39fa14474841fabb8d4db082278a24e76210016b on remote branch

Change-Id: I43996e791a94fe3779804dd716ff57219c78aa01