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

Change-Id: I5346a15d138a1ebc994cf6dd9beecd23a97d3d78