Merge changes I46690d1c,I84c11aa5
am: 0dda322d4a

Change-Id: I69cc4f5432da891ffa052ad6f56ef21a3bc0e46e