resolved conflicts for merge of ec9e8933 to klp-dev-plus-aosp

Change-Id: I220a034cf3293a4a29d8683f20812adac112bddd