Merge changes I45978ea4,Ia85b1008,I9e68c561,I9255dd3c am: 888e6b1499
am: d5eb469567

Change-Id: I84b7b23a297523782c3a6d6f251f010678a19990