Merge changes I80504f43,Ifc372eef
am: de7be840a7

Change-Id: Id86c979498e13f5e382c5a448becee8f7bfe72f0