Merge "Use CALLED_FROM_SETUP instead of KATI" am: bd4239a1e1
am: 8e7153bf98

Change-Id: I469e85d6699baf156581902e2e55e983ddd2b4d6