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

Change-Id: I95d710489a0ad87c6e3811603097e5438f11f413