Merge "FP2-1591:[ST_3][Monkey] 'com.android.phone' crash once" into fp2-dev-v2