Merge changes I6643c9ee,Ibd412b26 am: b5708a93b1 am: 5a3a6fa004
am: 3d79e423ec

Change-Id: Ie26fca25f9cc34af7d237a9cf92768ae634f17a1