Merge changes I66bbe8b5,Ie54677db
am: 4f5f8f4192

Change-Id: I25e2d9ea53fced5213236e09b6b28c7b87f4191b