This reverts commit 0c54e9becb. Change-Id: I8f9ce3310f98dd38f1b6fff1bae507fe2b756620 Closes-Bug: #1797035
0c54e9becb