Merge changes Id946ab1c,Ifacd01d6 am: 5de42a592a
am: 211fe93f19

Change-Id: Ia8c69e46c8ca1bd698f9ade1cc7c7259fda54fcb