Bug: 66921847 Test: manual Change-Id: I0c473790f83076def807308fe44db9cb9365769e
cf1a4614e1
c9c65317e8