Merge changes I81796b45,Iaf585336
am: 437bbed858

Change-Id: I87be93ed367ab6da0decc411ab832cf95322131a