Merge "Fix null pointer dereferencing in TWGBP" into oc-mr1-dev
am: e4bf97fbf4

Change-Id: Idf6dab48665317af55caed54e11d6fa0b28a32d6