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