Merge branch 'qcril' into jb-mr2

Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>