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

Change-Id: I7853e861904dac6a251979dfe841107f9956772d