Y20170618-0415
tagged this
12 Jun 16:12
Backport merged too early. Need to wait till 4.7.0 release. This reverts commit a8056906b41eb2845e36ea4b962b1544448ce563. Change-Id: I90acde26be4b492d7fc7e991d0fe01aeae841677