Fix test 1974 am: 01fc470f59
am: 1e62bf22cc

Change-Id: Id357be93fda02cf67b7b0a7dbdae29afa587ca59