Merge changes Ib4ef0843,I269962a3 am: f43b3bb3ee
am: a32ea36c31

Change-Id: I05e0bef71501155fa94f73b7444c9feca60aab6b