Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686 am: 90a033c688
am: d44aa8b9cc

Change-Id: I2e1420e1d966413a10cac0aaa347e816a98a2b40