Merge commit 'adf210d6' into nougat-mr1-cts-dev am: 48c63657 am: f9181a2e am: 0cab2a17 am: 639a82d4 Change-Id: I1c2965c9bbfb5ecce03e844a8e23dbdf15001d8d