Merge a8a0aadf29b55ebe3f16bf6dd9e923c9e6668288 on remote branch

Change-Id: I47cd8b19bff4b81fd73a00e9197e85f2adce44d2