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

Change-Id: Ia9ae415a51f7a103c4af000e72ac2f2e93a92949