Merge bd70eb36aca99d5bd1100837de6fbb07e7958f3f on remote branch

Change-Id: I6fef90aa9b6a721f09120d5165151184419be0e1