Merge "Prevent NPE in PulseExpansionHandler" into rvc-dev am: 6727245a59

Change-Id: I4b4c3bfc4db927e3af817cd0e47faeeba9ad54e0