Merge changes from topic "charger-shared-libs" am: 74cece70bc
am: 583f5fafb6

Change-Id: I026241ec61f2c44bce2b98bb3f94dff2ab569613