Merge "Fix bug #17936169 subsettings activity crashes on emulator for android-21" into lmp-mr1-dev