Merge changes I16000c0c,I325003cb
am: 76e342eba4

Change-Id: Ic1054509d2593498103df42e845852b74de27349