Merge "Merge changes from topic "incl_svc_parsing_fix" am: fee4546f am: 3aa179fa am: e22de0f2 am: 4df0b159"