Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev