[automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be am: b986143870

Change-Id: I3844fb6083799d1975c43644b66c69ec5611283e