[automerger skipped] Merge "Revert the removal of FBE related checks." am:...
[automerger skipped] Merge "Revert the removal of FBE related checks." am: c1d6f968 am: f02e4a71 -s ours am: c02bb758 -s ours
am skip reason: Change-Id Id8f30b18cc0ba95834c0cc5a4b98c96ddf49803e with SHA-1 1fe37023 is in history
Change-Id: I17dbffc72a31f5841ebc04dff321dafbbaf4341b