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

Change-Id: Ie07d2604e0c6b492b225b65586ebab44e14b0659