Merge b3ef7786072d031bb9f46eb316152c63b44f1d1d on remote branch

Change-Id: I47b080a40fc5c8682e60c881744de809178fb216