Refactor 904 for safety am: 9d3b5ec3bf
am: e8cbc59a12

Change-Id: Ieef115832a0d7fa4382e4e5d0cfefb97f0b2eb5d