Merge changes I92be8a46,I7a3b449f
am: 9cf3051bc7

Change-Id: I5300c1674f90c828ea9396444be383a860eb4ccf