Merge changes I87f2999f,I8af0e845
am: b07dcdba37

Change-Id: Ic63a95b96bea044ffeb9262aa2ad30f867876219