Merge "Merge commit '7ab68a1394235eb5762d21608c16cb5664767e2b' into nougat-mr1-cts-dev" into nougat-mr1-cts-dev