Merge remote-tracking branch

from internal master to aosp master via 'aosp/temp_b_34129325'
date 1/6/2017
Test: make vts