Merge changes I84a59a8c,Id7a92fb2
am: 9c2b798143

Change-Id: Ic613f0a63643346645654cedd233844b8ef9bfb8