Misc additions pulled up from kk and patched for LP

Change-Id: Ib21e386301a3e5d6b69c6dfd34ee0d11e1e5033e