Merge changes Ic4218b49,Ib91e16d8
am: a6712f8077

Change-Id: I3197db54195e45b8fe0331fcdbe1a50de16727d1