Merge \"Temporarily disable test E\"
am: aff0fa5748

Change-Id: I16344bc4093b2a9c57f1053a30e02e7d07863b69