take #1b Test: manual Fixes: 207123411 Bug: 202867177 Change-Id: Ieec00494e00656bcd0f2a3a1433d74850b59001b