* changes: Merge changes from topic "l1" into lollipop-mr1-cts-dev am: ba3927948d DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours
ba3927948d
36c5e0d87f