Test: Sanity Bug: 161319976 Change-Id: I931c5a7c5e9c5ee3fd72fa2c0a29df48073fd90c Merged-In: I931c5a7c5e9c5ee3fd72fa2c0a29df48073fd90c (cherry picked from commit 11bbbee915c5d02d4ef85c03695db8de8e486b9a) (cherry picked from commit 647d9fb723457e216e24c15717bbb7f1dadafecf)