Merge changes I8bbef5e3,Ib68bdc31,Ie39b7f59,I1ef8b65a
am: 8fba1e0a35

Change-Id: I35dbbc3942ff8d2dc9047eb731f36b8207276d4c