Merge "Remove otafault" am: a1e3d67bd7 am: 3f288e4389
am: 6b95e5cfd3

Change-Id: I7e2979511edcbb1f8cc2b789eca8bafa5751a926