Merge changes I5286112b,Ic5701d67
am: 2afb85a26b

Change-Id: I066c73d533c8a7eea86401b324853431861a70d1