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

Change-Id: I58954640036ac9e9f303b7cdd29c42f9a8f480ab