Merge "Revise Log call to remove method that could cause exception." into...
Merge "Revise Log call to remove method that could cause exception." into oc-mr1-dev am: 18129a58 am: d05fbe6d
am: 397e1e67
Change-Id: I628965465920dc488bb55b11ab62fe9594e2cd9d