Merge changes I5a3b876c,I81799165
am: 30604fa086

Change-Id: I643411a408f7ab041a44e483d06c11e5802b008d