Merge "Framework: Remove a nonsensical substring(0)"
am: 98627fa455

Change-Id: Iede6825cef351b4021dc1166b262124cefdfdca2