Merge 45cab0da946e4c6a71798d52c75a17de1e3c477f on remote branch

Change-Id: Ia57f854117b4d94220f693e206b08eebc625576c