Merge 40fa2050aa17c199590f3c293948c69cad24d725 on remote branch

Change-Id: I58e02c243f137a39d7ce380473e2f683543d9ec4