repopick: Update
Merge pull request #52 from AOSPA-legacy/lollipop

repopick: Update