Remove flaky test and clarify documentation. am: aa661fc957 am: 5e87f700a5 am: 44b087ec7a
am: 033a852b1a

Change-Id: Ica7e01ef682213943d140413c4e4a6ce37d015a4