Implementation yet to come but prevent app crashes. Change-Id: I81d6851ebf776a98e13c606bab272a03aec406ee
201469f5
bb7f590a