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

Change-Id: Iaf5a91482d7e8171ac654785773786d238ea4db1