Merge "Fix and enable ConnOnActivityStartTest." into oc-mr1-dev
am: 1c18b56520

Change-Id: I44f7b53de322b558f7319473d388aba5ab340633