Merge changes from topic "incl_svc_parsing_fix" am: fee4546fd6
am: 3aa179fabd

Change-Id: Ic6fe3edff44423031a2abb271bce875c05e71a88