GitLab

This is safe change for L release, but not the right way. we had right
implementation in upstream and will be full tested.

BUG:17485595
Change-Id: Ib6365511bad68f5c4a5bd3d71e6a2c57987dfb81