Merge changes I6c6bf61b,I3fb0b3a8 am: 3160a25010
am: 9d7880fe96

Change-Id: I3f339fdceaa146d5de54957ea35df38e4fc24472