resolved conflicts for merge of 1ac20c8a to klp-dev-plus-aosp Change-Id: If7795db5d4b41f8857241c51fa06a6ae1df1b3ad
This tree is empty.