Merge "Rename set/get-ConserveMemory" into pi-dev am: d2c218f78a
am: 844ecb325a

Change-Id: Ieb7c02b42c77230173688e493e3e2b5549279de1