Merge "PIP: Handle configuration changes" into nyc-dev
am: 75822138ad

* commit '75822138ad7f676592c5655df96fe76200b6ffb3':
  PIP: Handle configuration changes

Change-Id: I976b3e89aa4bc255138f411c855ab0ad1d8c50bd