Merge "Remove otafault"
am: a1e3d67bd7

Change-Id: I9615dbf572f34fb6fa9b3d2b37e40e81b66fdc33