Merge 9b13b44df9282d74e25397fe8537e8c85aab8ee0 on remote branch

Change-Id: Ifc65288b7bc2f5cba0f6a1c82d67ad9d76fb233e