Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev
am: ac77186d34

Change-Id: Ia5c6852cce42eb3fe600086c3140266a141bca03