Merge "Merge changes from topic "incl_svc_parsing_fix" am: fee4546fd6 am: 3aa179fabd am: e22de0f23f am: 4df0b1590c"