Change-Id: Ia665f2838c2ac59b4e9b123555e58549937c8bd3 Closes-Bug: #1367959
Change-Id: I71cc858c6c65cfa4351dffdfaeb3cf2db97868e6 Closes-Bug: #1367947