Merge 16e4f6da4b6c3612c6ffb550c69c46a794c8130e on remote branch

Change-Id: I6bed8278bc020a19f29efb622332d647b008e7dd