Merge klp-dev-plus-aosp into stage-aosp-master

Change-Id: I1c46e9613eb7638531b6abffee43ffc94b116018