Merge "Resolve usage of hidden API in Lists"
am: 79dc0135d7

Change-Id: I393463155aacd35e5c3821c504bad024dc6e9468