Merge changes from topics 'seinfo', 'public_dex' into oc-dev
am: 1f639435da

Change-Id: I02a2f1b5aef05f91d3766f28e2394b3091fcc1a1