Merge "Fix NPE in onHandleIntent" into lmp-mr1-dev