Merge "Address the comment of aosp/1288493" am: 974d6f5978

Change-Id: I706462c5dc4a0dbd4b921f2c446a13b1b408948a
tree: 5b89281b0210472a0ea1a323bc80f877b44519ff
  1. Tethering/