Merge changes I28f35a1e,Ieb72dc88
am: 670bf01c4a

Change-Id: I1254f8b88f5a08ffad7625ee0a464a06e73a6f17