Merge changes I37eb4151,If40a376d,Ic43b5cc6,Iaa9f304c
am: 82f245e9d6

Change-Id: Id3a05f509395ee986bd6a8708814910651788765