Merge changes I877b8027,I469bd931
am: 8848052c9f

Change-Id: I38f835416bc301303912b41fa7f512a5d8a6d50b