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

Change-Id: I5438e0e769474a47130132f7f6ca3ed670bfc053