Merge "Temporarily disable flaky test." am: 3fb5ba9e61
am: 36da0beab3

Change-Id: Ice8e6cd6cad901ca937ca0953049c2f9c83548f8