Merge "Fix NPE by pressing Volume Up/Down" am: fca5ee0bb8
am: bd57a4d8a1

Change-Id: I23595e55b5c38cecb39272f7c739c27abe1eddb3