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

Change-Id: I2d60b7f6e208fa2c7d97b7541021389a9d859c88