Merge remote-tracking branch 'vicamo/bugzilla/957526/emulator-kitkat' into HEAD
Temporary branching fix

Change-Id: Ib1fe615734d1a7d0c9bdd8202e6d422a3cd22d1d