Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev
am: 018a33cc35

Change-Id: If3153994b6609d626af3ed58c47f33aad5cf19ec