Merge 15911b0a405c9f86b527ae52ebd0c6182ca99d10 on remote branch

Change-Id: I7af76b8b63094a53d68644a58202e33604ac3c0d