Merge changes from topic 'net-sync-aosp-with-stage-aosp' into stage-aosp-master am: 277bd423 am: 22cd5338 am: 13df9a8f Change-Id: I21e82ec985335ed9aed78b3fc5dcb005d1ab025b