Merge changes I37eb4151,If40a376d,Ic43b5cc6,Iaa9f304c am: 82f245e9d6 am: 9983327446
am: 0eed66500c

Change-Id: I517aee98ea9f760e866e8ad87a5acea07725e3ee