Merge 953979df19721aa6f30732a9bd11a76fe374739e on remote branch

Change-Id: Ibb290ff8bb9bb304c211b40cee89d1e59412cc80