Merge b3ef7786072d031bb9f46eb316152c63b44f1d1d on remote branch

Change-Id: Id71dbd0eadbc3867643f8b2dfc7c0a6cb86e9685