Merge "HealthServiceWrapperAidl fix NPE" into tm-dev