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

Change-Id: Ie3c004e31016b4e3a1a0f7cb7c06cb01aed9e642