Update UI due to new API

Change-Id: I8a77f0698cd1d6cbf8479f833592ab69150c640c
Merge "Update UI due to new API"