Edit more for Blackout ROM

Change-Id: Ife37d6b6f41ec658922fee66cc68a67f770eded4