Merge "Small test fixes." am: 9a4f572a95 am: a61c3db243 am: 1bd88bab0d
am: 2bea1ce330

Change-Id: Idfd785883971afc964a68e2b9142c2e074ae0099