Merge "DirectReply: fix lockscreen crash" into nyc-mr1-dev am: fe7cab6042
am: 593f9cdde0

Change-Id: I86e4dfef4d031221e69b78c8cbded91ccdb93144