Merge changes from topic 'network_specifier' am: d0f476bdae
am: 362bef45d1

Change-Id: Iea17cb166f9c1bcec55cc8d404e00175aecb9918