[coastguard skipped] Merge sparse cherrypicks from sparse-10316531-L99500000961260703 into tm-qpr3-release.

COASTGUARD_SKIP: I29be3a3bdeaa31775e9baad5147a628ccc9fb838
COASTGUARD_SKIP: I4cf7a16ffda683a25e1cd6d1cce53940975740e6

Change-Id: I344b0e87d3c6ec9dcd39f9b22f0e0b887b462b0e
tree: 97e93e9d72cf6a02cdf2caecc9d35191e75c7c27
  1. .prebuilt_info/
  2. current/