Merge "Cleanup Frontend Status" into rvc-dev am: 3fe090f737

Change-Id: I77dbd0c6b9bfb9bb06a75682ab5deb3e83fbdd72