Track back locally: fwb, core and hw_qcom_display

Change-Id: Ie7ab66bdab80de4adb467945e772998ac8440794