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

Change-Id: Ic876fa39acab52308f5b280396f6d883fb52a73d